bitkeeper revision 1.404 (3f57607dkEm0-zZkL-qD7DTt8vKceQ)

apic.c:
  Another bug fix for no-APIC systems.

diff --git a/xen/arch/i386/apic.c b/xen/arch/i386/apic.c
index ecc96eab2f28bc323a334752d4057e496888b228..f2ea5bd4a0a63d5edb3bcf9a1a4a94ec3bb8b245 100644 (file)
--- a/xen/arch/i386/apic.c
+++ b/xen/arch/i386/apic.c
@@ -683,6 +683,13 @@ int reprogram_ac_timer(s_time_t timeout)
         return 0;       /* timeout value in the past */
     }
 
+    /*
+     * If we don't have local APIC then we just poll the timer list off the
+     * PIT interrupt. Cheesy but good enough to work on eg. VMware :-)
+     */
+    if ( !cpu_has_apic )
+        return 1;
+
     /* conversion to bus units */
     apic_tmict = (((u64)bus_scale) * expire)>>18;